Ensure constants written correctly to LP/NL files #2953
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mrmundt
reviewed
Aug 23, 2023
| @@ -1478,10 +1499,28 @@ def _write_nl_expression(self, repn, include_const): | |||
| if include_const and repn.const: | |||
| # Add the constant to the NL expression. AMPL adds the | |||
| # constant as the second argument, so we will too. | |||
| nl = self.template.binary_sum + nl + (self.template.const % repn.const) | |||
| nl = ( | |||
There was a problem hiding this comment.
I hate what black did to this.
mrmundt
approved these changes
Aug 23, 2023
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## main #2953 +/- ##
==========================================
+ Coverage 88.04% 88.10% +0.05%
==========================================
Files 768 769 +1
Lines 89260 89708 +448
==========================================
+ Hits 78592 79034 +442
- Misses 10668 10674 +6
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
blnicho
reviewed
Aug 23, 2023
blnicho
approved these changes
Aug 23, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2927, Fixes #2928
Summary/Motivation:
The LP and NL writers were more flexible in the data types they accepted, but introduced cases where non-int/float data types were written out to the NL or LP files. This PR goes through and ensures that all numeric constants are mapped to either int or float being written out to the file.
Note that this restores the original behavior reported in the issue, but does not fix the slightly more egregious error of permitting the use of
Booleanas a domain for (numeric)Constraints.Changes proposed in this PR:
intorfloatbefore writing them out to the LP/NL fileVarandConstraintlb/ubproperties to ensure that the returned vales are either native numeric types orNone. This also ensures that ``inf/-infare mapped to None before returning them to the userLegal Acknowledgement
By contributing to this software project, I have read the contribution guide and agree to the following terms and conditions for my contribution: